From 1dd38297f4bad2c6e72de030faa7095064db4964 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Fri, 7 Dec 2012 13:43:17 +0100 Subject: [PATCH] x86/p2m: drop redundant macro definitions Also, add log level indicator to P2M_ERROR(), and drop pointless underscores from all related macros' parameter names. Signed-off-by: Jan Beulich Acked-by: Keir Fraser --- xen/arch/x86/mm/p2m.c | 12 ------------ xen/include/asm-x86/p2m.h | 14 +++++++------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e35194216c..258f46e21a 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -46,18 +46,6 @@ boolean_param("hap_1gb", opt_hap_1gb); bool_t __read_mostly opt_hap_2mb = 1; boolean_param("hap_2mb", opt_hap_2mb); -/* Printouts */ -#define P2M_PRINTK(_f, _a...) \ - debugtrace_printk("p2m: %s(): " _f, __func__, ##_a) -#define P2M_ERROR(_f, _a...) \ - printk("pg error: %s(): " _f, __func__, ##_a) -#if P2M_DEBUGGING -#define P2M_DEBUG(_f, _a...) \ - debugtrace_printk("p2mdebug: %s(): " _f, __func__, ##_a) -#else -#define P2M_DEBUG(_f, _a...) do { (void)(_f); } while(0) -#endif - /* Override macros from asm/page.h to make them work with mfn_t */ #undef mfn_to_page diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 907a817353..2bd2048de8 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -607,15 +607,15 @@ extern void audit_p2m(struct domain *d, #endif /* P2M_AUDIT */ /* Printouts */ -#define P2M_PRINTK(_f, _a...) \ - debugtrace_printk("p2m: %s(): " _f, __func__, ##_a) -#define P2M_ERROR(_f, _a...) \ - printk("pg error: %s(): " _f, __func__, ##_a) +#define P2M_PRINTK(f, a...) \ + debugtrace_printk("p2m: %s(): " f, __func__, ##a) +#define P2M_ERROR(f, a...) \ + printk(XENLOG_G_ERR "pg error: %s(): " f, __func__, ##a) #if P2M_DEBUGGING -#define P2M_DEBUG(_f, _a...) \ - debugtrace_printk("p2mdebug: %s(): " _f, __func__, ##_a) +#define P2M_DEBUG(f, a...) \ + debugtrace_printk("p2mdebug: %s(): " f, __func__, ##a) #else -#define P2M_DEBUG(_f, _a...) do { (void)(_f); } while(0) +#define P2M_DEBUG(f, a...) do { (void)(f); } while(0) #endif /* Called by p2m code when demand-populating a PoD page */ -- 2.30.2